From 101f1c7b42ff47936238f9be10c8e7a58f9e300a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 31 Jan 2019 14:05:28 -0500
Subject: [PATCH] gdk: Stop using deprecated pango api

---
 gdk/wayland/gdkkeys-wayland.c | 5 +++--
 gdk/x11/gdkkeys-x11.c         | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index cad938f5f0..9a6809d23b 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -31,12 +31,13 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <fribidi.h>
 
 #include "gdk.h"
 #include "gdkwayland.h"
 
 #include "gdkprivate-wayland.h"
-#include "gdkinternals.h"
+#include "gdk-private.h"
 #include "gdkkeysprivate.h"
 
 #include <xkbcommon/xkbcommon.h>
@@ -499,7 +500,7 @@ update_direction (GdkWaylandKeymap *keymap)
              {
                PangoDirection dir;
 
-               dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
+               dir = gdk_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
                switch (dir)
                  {
                  case PANGO_DIRECTION_RTL:
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index be54e66e18..4c27ac3472 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -29,6 +29,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+#include "gdk-private.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -480,7 +481,7 @@ get_direction (XkbDescRec *xkb,
     {
       gint level = 0;
       KeySym sym = XkbKeySymEntry (xkb, code, level, group);
-      PangoDirection dir = pango_unichar_direction (gdk_keyval_to_unicode (sym));
+      PangoDirection dir = gdk_unichar_direction (gdk_keyval_to_unicode (sym));
 
       switch (dir)
         {
-- 
2.30.2